MM-211016  OSX stuff from 2019 to be updated for mfp1.5w4.0.x

